configure: use CFLAGS, etc. _FOR_BUILD as well

When not doing cross-builds, use the values of CFLAGS, CPPFLAGS and
LDFLAGS as the default value for CFLAGS_FOR_BUILD, CPPFLAGS_FOR_BUILD
and LDFLAGS_FOR_BUILD, respectively.

This avoids having to manually specify these variables in order to get
extract-strings to build properly.

This should really be handled by ax_prog_cc_for_build.m4.  That has been
reported upstream.  This is a workaround for now.

https://bugzilla.gnome.org/show_bug.cgi?id=721346

diff --git a/configure.ac b/configure.ac
index 04c8f640ea3b769b08442af102d98c7d652ced4f..97b1cabb8b3e4a38a81fa9f856c929f622cae5c7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,6 +123,19 @@ m4_define([gail_lt_current_minus_age],[m4_eval(gail_lt_current - gail_lt_age)])
 AC_SUBST([GAIL_LT_VERSION_INFO],[gail_lt_version_info])
 AC_SUBST([GAIL_LT_CURRENT_MINUS_AGE],[gail_lt_current_minus_age])
 
+# Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=721346 until fixed upstream in autoconf-archive
+if test "$cross_compiling" = "no"; then
+  if test -n "$CFLAGS"; then
+    CFLAGS_FOR_BUILD=$CFLAGS
+  fi
+  if test -n "$CPPFLAGS"; then
+    CPPFLAGS_FOR_BUILD=$CPPFLAGS
+  fi
+  if test -n "$LDFLAGS"; then
+    LDFLAGS_FOR_BUILD=$LDFLAGS
+  fi
+fi
+
 # Checks for programs.
 AC_PROG_CC
 AX_PROG_CC_FOR_BUILD